Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

NO-ISSUE: Adjust CI for all branches #2433

Merged
merged 1 commit into from
Jun 18, 2024

Conversation

rodrigonull
Copy link
Contributor

In this PR:

@rodrigonull rodrigonull requested a review from tiagobento as a code owner June 17, 2024 17:04
@@ -1,4 +1,4 @@
FROM cruizba/ubuntu-dind:noble-26.1.3
FROM cruizba/ubuntu-dind:jammy-26.1.3
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's the difference between "noble" and "jammy"? :D

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

noble is ubuntu 24.04 and jammy is ubuntu 22.04

@@ -54,8 +53,7 @@ pipeline {
"https://github.com/${pipelineVars.githubRepositoryOrg}/${pipelineVars.githubRepositoryName}.git",
"${pipelineVars.kieToolsBotGithubCredentialsId}"
)

BUILD_IMAGE_REQUIRED = githubUtils.fileIsInChangeset('incubator-kie-tools-ci-build.Dockerfile')
BUILD_IMAGE_REQUIRED = (BRANCH_NAME != 'main' || githubUtils.fileIsInChangeset('incubator-kie-tools-ci-build.Dockerfile'))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is BRANCH_NAME != 'main' for the case of new branches? If so, maybe we could have a way to check if a tag for that stream exists or not, right? Because otherwise, all PRs for non-main branches will re-build the image, no?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Your assumption is correct. The way we filter the job run is by adding a regular expression: (main|\d{1,2}\.\d{1,2}\.x) in the job configuration triggers.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right, so we need to change that... otherwise the new branches will unnecessarily build the image every time...

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As I mentioned in my previous comment we already have the regular expression filter applied in the jobs, so they will only be triggered for the main branch and for the branches that have their names following this pattern: 0.0.x

@rodrigonull rodrigonull requested a review from tiagobento June 18, 2024 12:41
@rodrigonull rodrigonull added the pr: DO NOT MERGE Draft PR, not ready for merging label Jun 18, 2024
@rodrigonull rodrigonull force-pushed the fix-dockerhub-image-names branch from 7df7c1b to 048cbe7 Compare June 18, 2024 18:12
@rodrigonull rodrigonull removed the pr: DO NOT MERGE Draft PR, not ready for merging label Jun 18, 2024
@tiagobento tiagobento merged commit 3cc3182 into apache:main Jun 18, 2024
14 checks passed
@rodrigonull rodrigonull deleted the fix-dockerhub-image-names branch June 18, 2024 18:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants